Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

3 files changed, 24 insertions, 5 deletions

diff --git a/app/assets/javascripts/import/constants.js b/app/assets/javascripts/import/constants.js
index b02eb3c4307..cbb01d0bbf1 100644
--- a/app/assets/javascripts/import/constants.js
+++ b/app/assets/javascripts/import/constants.js
@@ -7,9 +7,12 @@ export const BULK_IMPORT_STATIC_ITEMS = {
   epics: __('Epic'),
   issues: __('Issue'),
   labels: __('Label'),
+  iterations: __('Iteration'),
+  iterations_cadences: s__('Iterations|Iteration cadence'),
   members: __('Member'),
   merge_requests: __('Merge request'),
   milestones: __('Milestone'),
+  namespace_settings: s__('GroupSettings|Namespace setting'),
   project: __('Project'),
 };
 
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
index 5da16454032..a248dd3d2c4 100644
--- a/app/assets/javascripts/import/details/components/bulk_import_details_app.vue
+++ b/app/assets/javascripts/import/details/components/bulk_import_details_app.vue
@@ -1,10 +1,14 @@
 <script>
-import { __ } from '~/locale';
+import { sprintf, s__, __ } from '~/locale';
+import { getParameterValues } from '~/lib/utils/url_utility';
+
 import ImportDetailsTable from '~/import/details/components/import_details_table.vue';
 
 export default {
   name: 'BulkImportDetailsApp',
-  components: { ImportDetailsTable },
+  components: {
+    ImportDetailsTable,
+  },
 
   fields: [
     {
@@ -28,12 +32,25 @@ export default {
   ],
 
   LOCAL_STORAGE_KEY: 'gl-bulk-import-details-page-size',
+
+  gitlabLogo: window.gon.gitlab_logo,
+
+  computed: {
+    title() {
+      const id = getParameterValues('entity_id')[0];
+
+      return sprintf(s__('BulkImport|Items that failed to be imported for %{id}'), { id });
+    },
+  },
 };
 </script>
 
 <template>
   <div>
-    <h1>{{ s__('Import|GitLab Migration details') }}</h1>
+    <h1 class="gl-font-size-h1 gl-my-0 gl-py-4 gl-display-flex gl-align-items-center gl-gap-3">
+      <img :src="$options.gitlabLogo" class="gl-w-6 gl-h-6" />
+      <span>{{ title }}</span>
+    </h1>
 
     <import-details-table
       bulk-import
diff --git a/app/assets/javascripts/import/details/components/import_details_table.vue b/app/assets/javascripts/import/details/components/import_details_table.vue
index 535ccb525ac..8b9bf14e3a3 100644
--- a/app/assets/javascripts/import/details/components/import_details_table.vue
+++ b/app/assets/javascripts/import/details/components/import_details_table.vue
@@ -21,7 +21,6 @@ export default {
     GlTable,
     PaginationBar,
   },
-  STATISTIC_ITEMS,
 
   i18n: {
     fetchErrorMessage: s__('Import|An error occurred while fetching import details.'),
@@ -141,7 +140,7 @@ export default {
 
 <template>
   <div>
-    <gl-table :fields="fields" :items="items" class="gl-mt-5" :busy="loading" show-empty>
+    <gl-table :fields="fields" :items="items" :busy="loading" show-empty>
       <template #table-busy>
         <gl-loading-icon size="lg" class="gl-my-5" />
       </template>