Merge branch 'dz-manifest-import' into 'master'

Add manifest import

See merge request gitlab-org/gitlab-ce!20304

7 files changed, 129 insertions, 39 deletions

diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml
index 5e7be5cd37b..f0d1e837317 100644
--- a/app/views/import/_githubish_status.html.haml
+++ b/app/views/import/_githubish_status.html.haml
@@ -21,23 +21,13 @@
         %th= _('Status')
     %tbody
       - @already_added_projects.each do |project|
-        %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
+        %tr{ id: "project_#{project.id}", class: project_status_css_class(project.import_status) }
           %td
             = provider_project_link(provider, project.import_source)
           %td
             = link_to project.full_path, [project.namespace.becomes(Namespace), project]
           %td.job-status
-            - if project.import_status == 'finished'
-              %span
-                %i.fa.fa-check
-                = _('Done')
-            - elsif project.import_status == 'started'
-              %i.fa.fa-spinner.fa-spin
-              = _('Started')
-            - elsif project.import_status == 'failed'
-              = _('Failed')
-            - else
-              = project.human_import_status_name
+            = render 'import/project_status', project: project
 
       - @repos.each do |repo|
         %tr{ id: "repo_#{repo.id}", data: { qa: { repo_path: repo.full_name } } }
@@ -61,6 +51,6 @@
               = has_ci_cd_only_params? ? _('Connect') : _('Import')
               = icon("spinner spin", class: "loading-icon")
 
-.js-importer-status{ data: { jobs_import_path: "#{url_for([:jobs, :import, provider])}",
-                             import_path: "#{url_for([:import, provider])}",
-                             ci_cd_only: "#{has_ci_cd_only_params?}" } }
+.js-importer-status{ data: { jobs_import_path: url_for([:jobs, :import, provider]),
+                             import_path: url_for([:import, provider]),
+                             ci_cd_only: has_ci_cd_only_params?.to_s } }
diff --git a/app/views/import/_project_status.html.haml b/app/views/import/_project_status.html.haml
new file mode 100644
index 00000000000..280bcbc1e63
--- /dev/null
+++ b/app/views/import/_project_status.html.haml
@@ -0,0 +1,11 @@
+- case project.import_status
+- when 'finished'
+  = icon('check')
+  = _('Done')
+- when 'started'
+  = icon("spinner spin")
+  = _('Started')
+- when 'failed'
+  = _('Failed')
+- else
+  = project.human_import_status_name
diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml
new file mode 100644
index 00000000000..763beb5958f
--- /dev/null
+++ b/app/views/import/manifest/_form.html.haml
@@ -0,0 +1,23 @@
+= form_tag upload_import_manifest_path, multipart: true do
+  .form-group
+    = label_tag :group_id, nil, class: 'label-light' do
+      = _('Group')
+    .input-group
+      .input-group-prepend.has-tooltip{ title: root_url }
+        .input-group-text
+          = root_url
+      = select_tag :group_id, namespaces_options(nil, display_path: true, groups_only: true), { class: 'select2 js-select-namespace' }
+    .form-text.text-muted
+      = _('Choose the top-level group for your repository imports.')
+
+  .form-group
+    = label_tag :manifest, class: 'label-light' do
+      = _('Manifest')
+    = file_field_tag :manifest, class: 'form-control-file', required: true
+    .form-text.text-muted
+      = _('Import multiple repositories by uploading a manifest file.')
+      = link_to icon('question-circle'), help_page_path('user/project/import/manifest')
+
+  .append-bottom-10
+    = submit_tag _('List available repositories'), class: 'btn btn-success'
+    = link_to _('Cancel'), new_project_path, class: 'btn btn-cancel'
diff --git a/app/views/import/manifest/new.html.haml b/app/views/import/manifest/new.html.haml
new file mode 100644
index 00000000000..056e4922b9e
--- /dev/null
+++ b/app/views/import/manifest/new.html.haml
@@ -0,0 +1,12 @@
+- page_title "Manifest file import"
+- header_title "Projects", root_path
+
+%h3.page-title
+  = _('Manifest file import')
+
+- if @errors.present?
+  .alert.alert-danger
+    - @errors.each do |error|
+      = error
+
+= render 'form'
diff --git a/app/views/import/manifest/status.html.haml b/app/views/import/manifest/status.html.haml
new file mode 100644
index 00000000000..5b2e1005398
--- /dev/null
+++ b/app/views/import/manifest/status.html.haml
@@ -0,0 +1,42 @@
+- page_title "Manifest import"
+- header_title "Projects", root_path
+- provider = 'manifest'
+
+%h3.page-title
+  = _('Manifest file import')
+
+%p
+  = button_tag class: "btn btn-import btn-success js-import-all" do
+    = import_all_githubish_repositories_button_label
+    = icon("spinner spin", class: "loading-icon")
+
+.table-responsive
+  %table.table.import-jobs
+    %thead
+      %tr
+        %th= _('Repository URL')
+        %th= _('To GitLab')
+        %th= _('Status')
+    %tbody
+      - @already_added_projects.each do |project|
+        %tr{ id: "project_#{project.id}", class: project_status_css_class(project.import_status) }
+          %td
+            = project.import_url
+          %td
+            = link_to_project project
+          %td.job-status
+            = render 'import/project_status', project: project
+
+      - @pending_repositories.each do |repository|
+        %tr{ id: "repo_#{repository[:id]}" }
+          %td
+            = repository[:url]
+          %td.import-target
+            = import_project_target(@group.full_path, repository[:path])
+          %td.import-actions.job-status
+            = button_tag class: "btn btn-import js-add-to-import" do
+              = _('Import')
+              = icon("spinner spin", class: "loading-icon")
+
+.js-importer-status{ data: { jobs_import_path: url_for([:jobs, :import, provider]),
+                             import_path: url_for([:import, provider]) } }
diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml
index 8f535b9d789..3da6db08580 100644
--- a/app/views/projects/_import_project_pane.html.haml
+++ b/app/views/projects/_import_project_pane.html.haml
@@ -1,49 +1,62 @@
 - active_tab = local_assigns.fetch(:active_tab, 'blank')
-- f = local_assigns.fetch(:f)
 
 .project-import
   .form-group.import-btn-container.clearfix
-    = f.label :visibility_level, class: 'label-light' do #the label here seems wrong
+    %h5
       Import project from
     .import-buttons
       - if gitlab_project_import_enabled?
         .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
           = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
             = icon('gitlab', text: 'GitLab export')
-      %div
-        - if github_import_enabled?
+
+      - if github_import_enabled?
+        %div
           = link_to new_import_github_path, class: 'btn js-import-github' do
             = icon('github', text: 'GitHub')
-      %div
-        - if bitbucket_import_enabled?
+
+      - if bitbucket_import_enabled?
+        %div
           = link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}" do
             = icon('bitbucket', text: 'Bitbucket')
           - unless bitbucket_import_configured?
             = render 'bitbucket_import_modal'
-      %div
-        - if gitlab_import_enabled?
+
+      - if gitlab_import_enabled?
+        %div
           = link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}" do
             = icon('gitlab', text: 'GitLab.com')
           - unless gitlab_import_configured?
             = render 'gitlab_import_modal'
-      %div
-        - if google_code_import_enabled?
+
+      - if google_code_import_enabled?
+        %div
           = link_to new_import_google_code_path, class: 'btn import_google_code' do
             = icon('google', text: 'Google Code')
-      %div
-        - if fogbugz_import_enabled?
+
+      - if fogbugz_import_enabled?
+        %div
           = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
             = icon('bug', text: 'Fogbugz')
-      %div
-        - if gitea_import_enabled?
+
+      - if gitea_import_enabled?
+        %div
           = link_to new_import_gitea_path, class: 'btn import_gitea' do
             = custom_icon('go_logo')
             Gitea
-      %div
-        - if git_import_enabled?
+
+      - if git_import_enabled?
+        %div
           %button.btn.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' } }
             = icon('git', text: 'Repo by URL')
+
+      - if manifest_import_enabled?
+        %div
+          = link_to new_import_manifest_path, class: 'btn import_manifest' do
+            = icon('file-text-o', text: 'Manifest file')
+
   .js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') }
-    %hr
+    = form_for @project, html: { class: 'new_project' } do |f|
+      %hr
       = render "shared/import_form", f: f
       = render 'new_project_fields', f: f, project_name_id: "import-url-name"
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 5bb1bfb7059..6c363345e38 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -55,13 +55,12 @@
                   = render 'project_templates', f: f
 
         .tab-pane.import-project-pane.js-toggle-container{ id: 'import-project-pane', class: active_when(active_tab == 'import'), role: 'tabpanel' }
-          = form_for @project, html: { class: 'new_project' } do |f|
-            - if import_sources_enabled?
-              = render 'import_project_pane', f: f, active_tab: active_tab
-            - else
-              .nothing-here-block
-                %h4 No import options available
-                %p Contact an administrator to enable options for importing your project.
+          - if import_sources_enabled?
+            = render 'import_project_pane', active_tab: active_tab
+          - else
+            .nothing-here-block
+              %h4 No import options available
+              %p Contact an administrator to enable options for importing your project.
 
 .save-project-loader.d-none
   .center