Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/analytics/product_analytics/activity_charts_bundle.js

@@ -2,6 +2,21 @@ import { buildApiUrl } from '~/api/api_utils';
 import axios from '~/lib/utils/axios_utils';
 
 const BULK_IMPORT_ENTITIES_PATH = '/api/:version/bulk_imports/entities';
+const BULK_IMPORT_ENTITIES_FAILURES_PATH =
+  '/api/:version/bulk_imports/:id/entities/:entity_id/failures';
 
 export const getBulkImportsHistory = (params) =>
   axios.get(buildApiUrl(BULK_IMPORT_ENTITIES_PATH), { params });
+
+export const getBulkImportFailures = (id, entityId, { page, perPage }) => {
+  const failuresPath = buildApiUrl(BULK_IMPORT_ENTITIES_FAILURES_PATH)
+    .replace(':id', encodeURIComponent(id))
+    .replace(':entity_id', encodeURIComponent(entityId));
+
+  return axios.get(failuresPath, {
+    params: {
+      page,
+      per_page: perPage,
+    },
+  });
+};

app/assets/javascripts/analytics/product_analytics/components/activity_chart.vue

@@ -1,6 +1,18 @@
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { __, s__ } from '~/locale';
 
+export const BULK_IMPORT_STATIC_ITEMS = {
+  badges: __('Badge'),
+  boards: s__('IssueBoards|Board'),
+  epics: __('Epic'),
+  issues: __('Issue'),
+  labels: __('Label'),
+  members: __('Member'),
+  merge_requests: __('Merge request'),
+  milestones: __('Milestone'),
+  project: __('Project'),
+};
+
 const STATISTIC_ITEMS = {
   diff_note: __('Diff notes'),
   issue: __('Issues'),

app/assets/javascripts/api/bulk_imports_api.js

@@ -1,15 +1,44 @@
 <script>
+import { __ } from '~/locale';
 import ImportDetailsTable from '~/import/details/components/import_details_table.vue';
 
 export default {
   name: 'BulkImportDetailsApp',
   components: { ImportDetailsTable },
+
+  fields: [
+    {
+      key: 'relation',
+      label: __('Type'),
+      tdClass: 'gl-white-space-nowrap',
+    },
+    {
+      key: 'source_title',
+      label: __('Title'),
+      tdClass: 'gl-md-w-30 gl-word-break-word',
+    },
+    {
+      key: 'error',
+      label: __('Error'),
+    },
+    {
+      key: 'correlation_id_value',
+      label: __('Correlation ID'),
+    },
+  ],
+
+  LOCAL_STORAGE_KEY: 'gl-bulk-import-details-page-size',
 };
 </script>
 
 <template>
   <div>
     <h1>{{ s__('Import|GitLab Migration details') }}</h1>
-    <import-details-table />
+
+    <import-details-table
+      bulk-import
+      :fields="$options.fields"
+      :local-storage-key="$options.LOCAL_STORAGE_KEY"
+    />
   </div>
 </template>

app/assets/javascripts/import/constants.js

@@ -1,14 +1,44 @@
 <script>
+import { __ } from '~/locale';
 import ImportDetailsTable from './import_details_table.vue';
 
 export default {
+  name: 'ImportDetailsApp',
   components: { ImportDetailsTable },
+
+  fields: [
+    {
+      key: 'type',
+      label: __('Type'),
+      tdClass: 'gl-white-space-nowrap',
+    },
+    {
+      key: 'title',
+      label: __('Title'),
+      tdClass: 'gl-md-w-30 gl-word-break-word',
+    },
+    {
+      key: 'provider_url',
+      label: __('URL'),
+      tdClass: 'gl-white-space-nowrap',
+    },
+    {
+      key: 'details',
+      label: __('Details'),
+    },
+  ],
+
+  LOCAL_STORAGE_KEY: 'gl-import-details-page-size',
 };
 </script>
 
 <template>
   <div>
     <h1>{{ s__('Import|GitHub import details') }}</h1>
-    <import-details-table />
+
+    <import-details-table
+      :fields="$options.fields"
+      :local-storage-key="$options.LOCAL_STORAGE_KEY"
+    />
   </div>
 </template>

app/assets/javascripts/import/details/components/bulk_import_details_app.vue

@@ -1,12 +1,13 @@
 <script>
 import { GlEmptyState, GlIcon, GlLink, GlLoadingIcon, GlTable } from '@gitlab/ui';
-import { __, s__ } from '~/locale';
+import { s__ } from '~/locale';
 import { createAlert } from '~/alert';
 import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 import { getParameterValues } from '~/lib/utils/url_utility';
 
 import PaginationBar from '~/vue_shared/components/pagination_bar/pagination_bar.vue';
-import { STATISTIC_ITEMS } from '../../constants';
+import { getBulkImportFailures } from '~/rest_api';
+import { BULK_IMPORT_STATIC_ITEMS, STATISTIC_ITEMS } from '../../constants';
 import { fetchImportFailures } from '../api';
 
 const DEFAULT_PAGE_SIZE = 20;
@@ -21,28 +22,6 @@ export default {
     PaginationBar,
   },
   STATISTIC_ITEMS,
-  LOCAL_STORAGE_KEY: 'gl-import-details-page-size',
-  fields: [
-    {
-      key: 'type',
-      label: __('Type'),
-      tdClass: 'gl-white-space-nowrap',
-    },
-    {
-      key: 'title',
-      label: __('Title'),
-      tdClass: 'gl-md-w-30 gl-word-break-word',
-    },
-    {
-      key: 'provider_url',
-      label: __('URL'),
-      tdClass: 'gl-white-space-nowrap',
-    },
-    {
-      key: 'details',
-      label: __('Details'),
-    },
-  ],
 
   i18n: {
     fetchErrorMessage: s__('Import|An error occurred while fetching import details.'),
@@ -55,6 +34,25 @@ export default {
     },
   },
 
+  props: {
+    bulkImport: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+
+    fields: {
+      type: Array,
+      required: true,
+    },
+
+    localStorageKey: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+
   data() {
     return {
       items: [],
@@ -97,18 +95,28 @@ export default {
       this.loadImportFailures();
     },
 
+    fetchFn(params) {
+      return this.bulkImport
+        ? getBulkImportFailures(
+            getParameterValues('id')[0],
+            getParameterValues('entity_id')[0],
+            params,
+          )
+        : fetchImportFailures(this.failuresPath, {
+            projectId: getParameterValues('project_id')[0],
+            ...params,
+          });
+    },
+
     async loadImportFailures() {
-      if (!this.failuresPath) {
+      if (!this.bulkImport && !this.failuresPath) {
         return;
       }
 
       this.loading = true;
+
       try {
-        const response = await fetchImportFailures(this.failuresPath, {
-          projectId: getParameterValues('project_id')[0],
-          page: this.page,
-          perPage: this.perPage,
-        });
+        const response = await this.fetchFn({ page: this.page, perPage: this.perPage });
 
         const { page, perPage, totalPages, total } = parseIntPagination(
           normalizeHeaders(response.headers),
@@ -123,13 +131,17 @@ export default {
       }
       this.loading = false;
     },
+
+    itemTypeText(type) {
+      return (this.bulkImport ? BULK_IMPORT_STATIC_ITEMS[type] : STATISTIC_ITEMS[type]) || type;
+    },
   },
 };
 </script>
 
 <template>
   <div>
-    <gl-table :fields="$options.fields" :items="items" class="gl-mt-5" :busy="loading" show-empty>
+    <gl-table :fields="fields" :items="items" class="gl-mt-5" :busy="loading" show-empty>
       <template #table-busy>
         <gl-loading-icon size="lg" class="gl-my-5" />
       </template>
@@ -139,20 +151,38 @@ export default {
       </template>
 
       <template #cell(type)="{ item: { type } }">
-        {{ $options.STATISTIC_ITEMS[type] }}
+        {{ itemTypeText(type) }}
       </template>
       <template #cell(provider_url)="{ item: { provider_url } }">
         <gl-link v-if="provider_url" :href="provider_url" target="_blank">
           {{ provider_url }}
           <gl-icon name="external-link" />
         </gl-link>
       </template>
+
+      <template #cell(relation)="{ item: { relation } }">
+        {{ itemTypeText(relation) }}
+      </template>
+      <template #cell(source_title)="{ item: { source_title, source_url } }">
+        <gl-link v-if="source_url" :href="source_url" target="_blank">
+          {{ source_title }}
+          <gl-icon name="external-link" />
+        </gl-link>
+        <span v-else>
+          {{ source_title }}
+        </span>
+      </template>
+      <template #cell(error)="{ item: { exception_class, exception_message } }">
+        <strong>{{ exception_class }}</strong>
+        <p>{{ exception_message }}</p>
+      </template>
     </gl-table>
+
     <pagination-bar
       v-if="hasItems"
       :page-info="pageInfo"
       class="gl-mt-5"
-      :storage-key="$options.LOCAL_STORAGE_KEY"
+      :storage-key="localStorageKey"
       @set-page="setPage"
       @set-page-size="setPageSize"
     />

app/assets/javascripts/import/details/components/import_details_app.vue

@@ -8,14 +8,9 @@ export const initBulkImportDetails = () => {
     return null;
   }
 
-  const { failuresPath } = el.dataset;
-
   return new Vue({
     el,
     name: 'BulkImportDetailsRoot',
-    provide: {
-      failuresPath,
-    },
     render(createElement) {
       return createElement(BulkImportDetailsApp);
     },