From aee0a117a889461ce8ced6fcf73207fe017f1d99 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Dec 2021 13:37:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee

---
 .../import_groups/graphql/client_factory.js        | 31 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js')

diff --git a/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js b/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js
index bce6e7bcb1f..36da996ea17 100644
--- a/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js
+++ b/app/assets/javascripts/import_entities/import_groups/graphql/client_factory.js
@@ -14,6 +14,9 @@ export const clientTypenames = {
   BulkImportPageInfo: 'ClientBulkImportPageInfo',
   BulkImportTarget: 'ClientBulkImportTarget',
   BulkImportProgress: 'ClientBulkImportProgress',
+  BulkImportVersionValidation: 'ClientBulkImportVersionValidation',
+  BulkImportVersionValidationFeature: 'ClientBulkImportVersionValidationFeature',
+  BulkImportVersionValidationFeatures: 'ClientBulkImportVersionValidationFeatures',
 };
 
 function makeLastImportTarget(data) {
@@ -92,6 +95,18 @@ export function createResolvers({ endpoints }) {
             __typename: clientTypenames.BulkImportPageInfo,
             ...pagination,
           },
+          versionValidation: {
+            __typename: clientTypenames.BulkImportVersionValidation,
+            features: {
+              __typename: clientTypenames.BulkImportVersionValidationFeatures,
+              sourceInstanceVersion: data.version_validation.features.source_instance_version,
+              projectMigration: {
+                __typename: clientTypenames.BulkImportVersionValidationFeature,
+                available: data.version_validation.features.project_migration.available,
+                minVersion: data.version_validation.features.project_migration.min_version,
+              },
+            },
+          },
         };
         return response;
       },
@@ -142,9 +157,7 @@ export function createResolvers({ endpoints }) {
           };
         });
 
-        const {
-          data: { id: jobId },
-        } = await axios.post(endpoints.createBulkImport, {
+        const { data: originalResponse } = await axios.post(endpoints.createBulkImport, {
           bulk_import: importOperations.map((op) => ({
             source_type: 'group_entity',
             source_full_path: op.group.fullPath,
@@ -153,15 +166,21 @@ export function createResolvers({ endpoints }) {
           })),
         });
 
-        return importOperations.map((op) => {
+        const responses = Array.isArray(originalResponse)
+          ? originalResponse
+          : [{ success: true, id: originalResponse.id }];
+
+        return importOperations.map((op, idx) => {
+          const response = responses[idx];
           const lastImportTarget = {
             targetNamespace: op.targetNamespace,
             newName: op.newName,
           };
 
           const progress = {
-            id: jobId,
-            status: STATUSES.CREATED,
+            id: response.id || `local-${Date.now()}-${idx}`,
+            status: response.success ? STATUSES.CREATED : STATUSES.FAILED,
+            message: response.message || null,
           };
 
           localStorageCache.set(op.group.webUrl, { progress, lastImportTarget });
-- 
cgit v1.2.1