Merge branch '208907-convert-issues-import-button-to-dropdown' into 'master'

Convert Issue import button to dropdown

See merge request gitlab-org/gitlab!28109

app/assets/stylesheets/framework/secondary_navigation_elements.scss

@@ -121,6 +121,7 @@
     }
 
     > .btn,
+    > .btn-group,
     > .btn-container,
     > .dropdown,
     > input,
@@ -161,7 +162,8 @@
       .dropdown,
       .dropdown-toggle,
       .dropdown-menu-toggle,
-      .form-control {
+      .form-control,
+      > .btn-group {
         margin: 0 0 $gl-padding-8;
         display: block;
         width: 100%;

app/views/projects/issues/_nav_btns.html.haml

@@ -6,7 +6,7 @@
   - if show_feed_buttons
     = render 'shared/issuable/feed_buttons'
 
-  .btn-group.append-right-10<
+  .btn-group
     - if show_export_button
       = render_if_exists 'projects/issues/export_csv/button'
 

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

 - type = local_assigns.fetch(:type, :icon)
 
-%button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon),
+- if Feature.enabled?(:jira_issue_import, @project)
+  .dropdown.btn-group
+    %button.btn.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
+      data: { toggle: 'dropdown' }, 'aria-label' => _('Import issues'), 'aria-haspopup' => 'true', 'aria-expanded' => 'false' }
+      - if type == :icon
+        = sprite_icon('import')
+      - else
+        = _('Import issues')
+    %ul.dropdown-menu
+      %li
+        %button.btn{ data: { toggle: 'modal', target: '.issues-import-modal' } }
+          = _('Import CSV')
+      %li= link_to _('Import from Jira'), project_import_jira_path(@project)
+- else
+  %button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon),
     data: { toggle: 'modal', target: '.issues-import-modal' } }
     - if type == :icon
       = sprite_icon('import')
     - else
       = _('Import CSV')
-
-- if Feature.enabled?(:jira_issue_import, @project)
-  = link_to _("Import Jira issues"), project_import_jira_path(@project), class: "btn btn-default"

locale/gitlab.pot

@@ -10815,9 +10815,6 @@ msgstr ""
 msgid "Import CSV"
 msgstr ""
 
-msgid "Import Jira issues"
-msgstr ""
-
 msgid "Import Projects from Gitea"
 msgstr ""
 
@@ -10833,6 +10830,9 @@ msgstr ""
 msgid "Import an exported GitLab project"
 msgstr ""
 
+msgid "Import from Jira"
+msgstr ""
+
 msgid "Import in progress"
 msgstr ""