Add latest changes from gitlab-org/gitlab@master

9 files changed, 67 insertions, 24 deletions

diff --git a/app/assets/javascripts/import/details/components/bulk_import_details_app.vue b/app/assets/javascripts/import/details/components/bulk_import_details_app.vue
new file mode 100644
index 00000000000..d6c16075482
--- /dev/null
+++ b/app/assets/javascripts/import/details/components/bulk_import_details_app.vue
@@ -0,0 +1,15 @@
+<script>
+import ImportDetailsTable from '~/import/details/components/import_details_table.vue';
+
+export default {
+  name: 'BulkImportDetailsApp',
+  components: { ImportDetailsTable },
+};
+</script>
+
+<template>
+  <div>
+    <h1>{{ s__('Import|GitLab Migration details') }}</h1>
+    <import-details-table />
+  </div>
+</template>
diff --git a/app/assets/javascripts/import/details/components/import_details_app.vue b/app/assets/javascripts/import/details/components/import_details_app.vue
index 13483fa8ba2..3aa60c00ff8 100644
--- a/app/assets/javascripts/import/details/components/import_details_app.vue
+++ b/app/assets/javascripts/import/details/components/import_details_app.vue
@@ -1,18 +1,14 @@
 <script>
-import { s__ } from '~/locale';
 import ImportDetailsTable from './import_details_table.vue';
 
 export default {
   components: { ImportDetailsTable },
-  i18n: {
-    pageTitle: s__('Import|GitHub import details'),
-  },
 };
 </script>
 
 <template>
   <div>
-    <h1>{{ $options.i18n.pageTitle }}</h1>
+    <h1>{{ s__('Import|GitHub import details') }}</h1>
     <import-details-table />
   </div>
 </template>
diff --git a/app/assets/javascripts/pages/import/bulk_imports/details/index.js b/app/assets/javascripts/pages/import/bulk_imports/details/index.js
new file mode 100644
index 00000000000..ca5de576536
--- /dev/null
+++ b/app/assets/javascripts/pages/import/bulk_imports/details/index.js
@@ -0,0 +1,25 @@
+import Vue from 'vue';
+import BulkImportDetailsApp from '~/import/details/components/bulk_import_details_app.vue';
+
+export const initBulkImportDetails = () => {
+  const el = document.querySelector('.js-bulk-import-details');
+
+  if (!el) {
+    return null;
+  }
+
+  const { failuresPath } = el.dataset;
+
+  return new Vue({
+    el,
+    name: 'BulkImportDetailsRoot',
+    provide: {
+      failuresPath,
+    },
+    render(createElement) {
+      return createElement(BulkImportDetailsApp);
+    },
+  });
+};
+
+initBulkImportDetails();
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js b/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
index e15987d7280..431348e1d57 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
@@ -1,6 +1,6 @@
 export const COMPONENTS = {
-  conflicts: () => import('./conflicts.vue'),
+  conflict: () => import('./conflicts.vue'),
   unresolved_discussions: () => import('./unresolved_discussions.vue'),
-  rebase: () => import('./rebase.vue'),
+  need_rebase: () => import('./rebase.vue'),
   default: () => import('./message.vue'),
 };
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/checks/message.vue b/app/assets/javascripts/vue_merge_request_widget/components/checks/message.vue
index 13bac52a806..37c07183c88 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/checks/message.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/checks/message.vue
@@ -4,8 +4,8 @@ import StatusIcon from '../widget/status_icon.vue';
 
 const ICON_NAMES = {
   failed: 'failed',
-  allowed_to_fail: 'neutral',
-  passed: 'success',
+  inactive: 'neutral',
+  success: 'success',
 };
 
 const FAILURE_REASONS = {
@@ -16,6 +16,10 @@ const FAILURE_REASONS = {
   draft_status: __('Merge request must not be draft.'),
   not_open: __('Merge request must be open.'),
   need_rebase: __('Merge request must be rebased, because a fast-forward merge is not possible.'),
+  not_approved: __('All required approvals must be given.'),
+  policies_denied: __('Denied licenses must be removed or approved.'),
+  merge_request_blocked: __('Merge request is blocked by another merge request.'),
+  status_checks_must_pass: __('Status checks must pass.'),
 };
 
 export default {
@@ -36,11 +40,11 @@ export default {
   },
   computed: {
     iconName() {
-      return ICON_NAMES[this.check.result];
+      return ICON_NAMES[this.check.status.toLowerCase()];
+    },
+    failureReason() {
+      return FAILURE_REASONS[this.check.identifier.toLowerCase()];
     },
-  },
-  i18n: {
-    FAILURE_REASONS,
   },
 };
 </script>
@@ -50,7 +54,7 @@ export default {
     <div class="gl-display-flex">
       <status-icon :icon-name="iconName" :level="2" />
       <div class="gl-w-full gl-min-w-0">
-        <div class="gl-display-flex">{{ $options.i18n.FAILURE_REASONS[check.identifier] }}</div>
+        <div class="gl-display-flex">{{ failureReason }}</div>
       </div>
       <slot></slot>
     </div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue
index c8dba36700c..ac9e76e05cd 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue
@@ -32,6 +32,6 @@ export default {
 
 <template>
   <merge-checks-message :check="check">
-    <action-buttons v-if="check.result === 'failed'" :tertiary-buttons="tertiaryActionsButtons" />
+    <action-buttons v-if="check.status === 'FAILED'" :tertiary-buttons="tertiaryActionsButtons" />
   </merge-checks-message>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.stories.js b/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.stories.js
index be3eb53fee0..d8476733656 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.stories.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.stories.js
@@ -32,14 +32,14 @@ const Template = ({ canMerge, failed, pushToSourceBranch }) => {
               mergeRequest: {
                 id: 1,
                 userPermissions: { canMerge },
-                mergeChecks: [
+                mergeabilityChecks: [
                   {
-                    identifier: 'discussions_not_resolved',
-                    result: failed ? 'failed' : 'passed',
+                    identifier: 'DISCUSSIONS_NOT_RESOLVED',
+                    status: failed ? 'FAILED' : 'SUCCESS',
                   },
                   {
-                    identifier: 'conflict',
-                    result: failed ? 'failed' : 'passed',
+                    identifier: 'CONFLICT',
+                    status: failed ? 'FAILED' : 'SUCCESS',
                   },
                 ],
               },
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue b/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue
index ecf2987307c..ac403c2c6f2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue
@@ -68,10 +68,10 @@ export default {
       );
     },
     checks() {
-      return this.state.mergeChecks || [];
+      return this.state.mergeabilityChecks || [];
     },
     failedChecks() {
-      return this.checks.filter((c) => c.result === 'failed');
+      return this.checks.filter((c) => c.status.toLowerCase() === 'failed');
     },
   },
   methods: {
@@ -79,7 +79,7 @@ export default {
       this.collapsed = !this.collapsed;
     },
     checkComponent(check) {
-      return COMPONENTS[check.identifier] || COMPONENTS.default;
+      return COMPONENTS[check.identifier.toLowerCase()] || COMPONENTS.default;
     },
   },
 };
diff --git a/app/assets/javascripts/vue_merge_request_widget/queries/merge_checks.query.graphql b/app/assets/javascripts/vue_merge_request_widget/queries/merge_checks.query.graphql
index 6b602a0095c..fcaddcc2a42 100644
--- a/app/assets/javascripts/vue_merge_request_widget/queries/merge_checks.query.graphql
+++ b/app/assets/javascripts/vue_merge_request_widget/queries/merge_checks.query.graphql
@@ -6,7 +6,10 @@ query mergeChecks($projectPath: ID!, $iid: String!) {
       userPermissions {
         canMerge
       }
-      mergeChecks @client
+      mergeabilityChecks {
+        identifier
+        status
+      }
     }
   }
 }