Add latest changes from gitlab-org/gitlab@master

4 files changed, 19 insertions, 3 deletions

diff --git a/app/assets/javascripts/jira_import/components/jira_import_app.vue b/app/assets/javascripts/jira_import/components/jira_import_app.vue
index b71c06e4217..b2c6ec47a26 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_app.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_app.vue
@@ -30,6 +30,10 @@ export default {
       type: String,
       required: true,
     },
+    jiraIntegrationPath: {
+      type: String,
+      required: true,
+    },
     jiraProjects: {
       type: Array,
       required: true,
@@ -133,7 +137,11 @@ export default {
       {{ errorMessage }}
     </gl-alert>
 
-    <jira-import-setup v-if="!isJiraConfigured" :illustration="setupIllustration" />
+    <jira-import-setup
+      v-if="!isJiraConfigured"
+      :illustration="setupIllustration"
+      :jira-integration-path="jiraIntegrationPath"
+    />
     <gl-loading-icon v-else-if="$apollo.loading" size="md" class="mt-3" />
     <jira-import-progress
       v-else-if="isImportInProgress"
diff --git a/app/assets/javascripts/jira_import/components/jira_import_progress.vue b/app/assets/javascripts/jira_import/components/jira_import_progress.vue
index 2d610224658..78f10decd31 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_progress.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_progress.vue
@@ -46,6 +46,9 @@ export default {
         importTime: formatDate(this.importTime),
       });
     },
+    issuesLink() {
+      return `${this.issuesPath}?search=${this.importProject}`;
+    },
   },
 };
 </script>
@@ -55,7 +58,7 @@ export default {
     :svg-path="illustration"
     :title="__('Import in progress')"
     :primary-button-text="__('View issues')"
-    :primary-button-link="issuesPath"
+    :primary-button-link="issuesLink"
   >
     <template #description>
       <p class="mb-0">{{ importInitiatorText }}</p>
diff --git a/app/assets/javascripts/jira_import/components/jira_import_setup.vue b/app/assets/javascripts/jira_import/components/jira_import_setup.vue
index 44773a773d5..285c5c815ac 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_setup.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_setup.vue
@@ -11,6 +11,10 @@ export default {
       type: String,
       required: true,
     },
+    jiraIntegrationPath: {
+      type: String,
+      required: true,
+    },
   },
 };
 </script>
@@ -21,6 +25,6 @@ export default {
     title=""
     :description="__('You will first need to set up Jira Integration to use this feature.')"
     :primary-button-text="__('Set up Jira Integration')"
-    primary-button-link="../services/jira/edit"
+    :primary-button-link="jiraIntegrationPath"
   />
 </template>
diff --git a/app/assets/javascripts/jira_import/index.js b/app/assets/javascripts/jira_import/index.js
index 8bd70e4e277..b576668fe7c 100644
--- a/app/assets/javascripts/jira_import/index.js
+++ b/app/assets/javascripts/jira_import/index.js
@@ -27,6 +27,7 @@ export default function mountJiraImportApp() {
           inProgressIllustration: el.dataset.inProgressIllustration,
           isJiraConfigured: parseBoolean(el.dataset.isJiraConfigured),
           issuesPath: el.dataset.issuesPath,
+          jiraIntegrationPath: el.dataset.jiraIntegrationPath,
           jiraProjects: el.dataset.jiraProjects ? JSON.parse(el.dataset.jiraProjects) : [],
           projectPath: el.dataset.projectPath,
           setupIllustration: el.dataset.setupIllustration,