Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

10 files changed, 56 insertions, 49 deletions

diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index 153c58b556e..80e2e73f420 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -7,7 +7,7 @@ import setNewNameMutation from '../graphql/mutations/set_new_name.mutation.graph
 import importGroupMutation from '../graphql/mutations/import_group.mutation.graphql';
 import ImportTableRow from './import_table_row.vue';
 
-const mapApolloMutations = mutations =>
+const mapApolloMutations = (mutations) =>
   Object.fromEntries(
     Object.entries(mutations).map(([key, mutation]) => [
       key,
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue
index 07603d89f0f..1707ab10c89 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue
@@ -35,7 +35,7 @@ export default {
 
     select2Options() {
       return {
-        data: this.availableNamespaces.map(namespace => ({
+        data: this.availableNamespaces.map((namespace) => ({
           id: namespace.full_path,
           text: namespace.full_path,
         })),
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 4fcaa1b55fc..8f2d488d661 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
@@ -23,7 +23,7 @@ export function createResolvers({ endpoints }) {
         } = await client.query({ query: availableNamespacesQuery });
 
         return axios.get(endpoints.status).then(({ data }) => {
-          return data.importable_data.map(group => ({
+          return data.importable_data.map((group) => ({
             __typename: clientTypenames.BulkImportSourceGroup,
             ...group,
             status: STATUSES.NONE,
@@ -37,7 +37,7 @@ export function createResolvers({ endpoints }) {
 
       availableNamespaces: () =>
         axios.get(endpoints.availableNamespaces).then(({ data }) =>
-          data.map(namespace => ({
+          data.map((namespace) => ({
             __typename: clientTypenames.AvailableNamespace,
             ...namespace,
           })),
@@ -45,14 +45,14 @@ export function createResolvers({ endpoints }) {
     },
     Mutation: {
       setTargetNamespace(_, { targetNamespace, sourceGroupId }, { client }) {
-        new SourceGroupsManager({ client }).updateById(sourceGroupId, sourceGroup => {
+        new SourceGroupsManager({ client }).updateById(sourceGroupId, (sourceGroup) => {
           // eslint-disable-next-line no-param-reassign
           sourceGroup.import_target.target_namespace = targetNamespace;
         });
       },
 
       setNewName(_, { newName, sourceGroupId }, { client }) {
-        new SourceGroupsManager({ client }).updateById(sourceGroupId, sourceGroup => {
+        new SourceGroupsManager({ client }).updateById(sourceGroupId, (sourceGroup) => {
           // eslint-disable-next-line no-param-reassign
           sourceGroup.import_target.new_name = newName;
         });
diff --git a/app/assets/javascripts/import_entities/import_groups/graphql/services/source_groups_manager.js b/app/assets/javascripts/import_entities/import_groups/graphql/services/source_groups_manager.js
index f752ecc8cd6..047b04fe7d6 100644
--- a/app/assets/javascripts/import_entities/import_groups/graphql/services/source_groups_manager.js
+++ b/app/assets/javascripts/import_entities/import_groups/graphql/services/source_groups_manager.js
@@ -37,7 +37,7 @@ export class SourceGroupsManager {
   }
 
   setImportStatus(group, status) {
-    this.update(group, sourceGroup => {
+    this.update(group, (sourceGroup) => {
       // eslint-disable-next-line no-param-reassign
       sourceGroup.status = status;
     });
diff --git a/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js b/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js
index 5d2922b0ba8..41dd25b9150 100644
--- a/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js
+++ b/app/assets/javascripts/import_entities/import_groups/graphql/services/status_poller.js
@@ -5,7 +5,7 @@ import bulkImportSourceGroupsQuery from '../queries/bulk_import_source_groups.qu
 import { STATUSES } from '../../../constants';
 import { SourceGroupsManager } from './source_groups_manager';
 
-const groupId = i => `group${i}`;
+const groupId = (i) => `group${i}`;
 
 function generateGroupsQuery(groups) {
   return gql`{
@@ -46,14 +46,14 @@ export class StatusPoller {
       const { bulkImportSourceGroups } = this.client.readQuery({
         query: bulkImportSourceGroupsQuery,
       });
-      const groupsInProgress = bulkImportSourceGroups.filter(g => g.status === STATUSES.STARTED);
+      const groupsInProgress = bulkImportSourceGroups.filter((g) => g.status === STATUSES.STARTED);
       if (groupsInProgress.length) {
         const { data: results } = await this.client.query({
           query: generateGroupsQuery(groupsInProgress),
           fetchPolicy: 'no-cache',
         });
         const completedGroups = groupsInProgress.filter((_, idx) => Boolean(results[groupId(idx)]));
-        completedGroups.forEach(group => {
+        completedGroups.forEach((group) => {
           this.groupManager.setImportStatus(group, STATUSES.FINISHED);
         });
       }
diff --git a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
index 2b6b8b765a2..192d6e056cd 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
@@ -35,6 +35,7 @@ export default {
     ...mapGetters([
       'isLoading',
       'isImportingAnyRepo',
+      'importingRepoCount',
       'hasImportableRepos',
       'hasIncompatibleRepos',
       'importAllCount',
@@ -60,13 +61,17 @@ export default {
     },
 
     importAllButtonText() {
-      return this.hasIncompatibleRepos
-        ? n__(
-            'Import %d compatible repository',
-            'Import %d compatible repositories',
-            this.importAllCount,
-          )
-        : n__('Import %d repository', 'Import %d repositories', this.importAllCount);
+      if (this.isImportingAnyRepo) {
+        return n__('Importing %d repository', 'Importing %d repositories', this.importingRepoCount);
+      }
+
+      if (this.hasIncompatibleRepos)
+        return n__(
+          'Import %d compatible repository',
+          'Import %d compatible repositories',
+          this.importAllCount,
+        );
+      return n__('Import %d repository', 'Import %d repositories', this.importAllCount);
     },
 
     emptyStateText() {
diff --git a/app/assets/javascripts/import_entities/import_projects/store/actions.js b/app/assets/javascripts/import_entities/import_projects/store/actions.js
index 7b7afd13c55..a8217ff1033 100644
--- a/app/assets/javascripts/import_entities/import_projects/store/actions.js
+++ b/app/assets/javascripts/import_entities/import_projects/store/actions.js
@@ -12,9 +12,9 @@ import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 
 let eTagPoll;
 
-const hasRedirectInError = e => e?.response?.data?.error?.redirect;
-const redirectToUrlInError = e => visitUrl(e.response.data.error.redirect);
-const tooManyRequests = e => e.response.status === httpStatusCodes.TOO_MANY_REQUESTS;
+const hasRedirectInError = (e) => e?.response?.data?.error?.redirect;
+const redirectToUrlInError = (e) => visitUrl(e.response.data.error.redirect);
+const tooManyRequests = (e) => e.response.status === httpStatusCodes.TOO_MANY_REQUESTS;
 const pathWithParams = ({ path, ...params }) => {
   const filteredParams = Object.fromEntries(
     Object.entries(params).filter(([, value]) => value !== ''),
@@ -47,7 +47,7 @@ const importAll = ({ state, dispatch }) => {
   return Promise.all(
     state.repositories
       .filter(isProjectImportable)
-      .map(r => dispatch('fetchImport', r.importSource.id)),
+      .map((r) => dispatch('fetchImport', r.importSource.id)),
   );
 };
 
@@ -69,7 +69,7 @@ const fetchReposFactory = ({ reposPath = isRequired() }) => ({ state, commit })
     .then(({ data }) => {
       commit(types.RECEIVE_REPOS_SUCCESS, convertObjectPropsToCamelCase(data, { deep: true }));
     })
-    .catch(e => {
+    .catch((e) => {
       commit(types.SET_PAGE, nextPage - 1);
 
       if (hasRedirectInError(e)) {
@@ -114,7 +114,7 @@ const fetchImportFactory = (importPath = isRequired()) => ({ state, commit, gett
         repoId,
       });
     })
-    .catch(e => {
+    .catch((e) => {
       const serverErrorMessage = e?.response?.data?.errors;
       const flashMessage = serverErrorMessage
         ? sprintf(
@@ -145,7 +145,7 @@ export const fetchJobsFactory = (jobsPath = isRequired()) => ({ state, commit, d
     method: 'fetchJobs',
     successCallback: ({ data }) =>
       commit(types.RECEIVE_JOBS_SUCCESS, convertObjectPropsToCamelCase(data, { deep: true })),
-    errorCallback: e => {
+    errorCallback: (e) => {
       if (hasRedirectInError(e)) {
         redirectToUrlInError(e);
       } else {
diff --git a/app/assets/javascripts/import_entities/import_projects/store/getters.js b/app/assets/javascripts/import_entities/import_projects/store/getters.js
index 31e22b50554..ef01a67ec94 100644
--- a/app/assets/javascripts/import_entities/import_projects/store/getters.js
+++ b/app/assets/javascripts/import_entities/import_projects/store/getters.js
@@ -1,27 +1,23 @@
-import { STATUSES } from '../../constants';
-import { isProjectImportable, isIncompatible } from '../utils';
+import { isProjectImportable, isIncompatible, isImporting } from '../utils';
 
-export const isLoading = state => state.isLoadingRepos || state.isLoadingNamespaces;
+export const isLoading = (state) => state.isLoadingRepos || state.isLoadingNamespaces;
 
-export const isImportingAnyRepo = state =>
-  state.repositories.some(repo =>
-    [STATUSES.SCHEDULING, STATUSES.SCHEDULED, STATUSES.STARTED].includes(
-      repo.importedProject?.importStatus,
-    ),
-  );
+export const importingRepoCount = (state) => state.repositories.filter(isImporting).length;
 
-export const hasIncompatibleRepos = state => state.repositories.some(isIncompatible);
+export const isImportingAnyRepo = (state) => state.repositories.some(isImporting);
 
-export const hasImportableRepos = state => state.repositories.some(isProjectImportable);
+export const hasIncompatibleRepos = (state) => state.repositories.some(isIncompatible);
 
-export const importAllCount = state => state.repositories.filter(isProjectImportable).length;
+export const hasImportableRepos = (state) => state.repositories.some(isProjectImportable);
 
-export const getImportTarget = state => repoId => {
+export const importAllCount = (state) => state.repositories.filter(isProjectImportable).length;
+
+export const getImportTarget = (state) => (repoId) => {
   if (state.customImportTargets[repoId]) {
     return state.customImportTargets[repoId];
   }
 
-  const repo = state.repositories.find(r => r.importSource.id === repoId);
+  const repo = state.repositories.find((r) => r.importSource.id === repoId);
 
   return {
     newName: repo.importSource.sanitizedName,
diff --git a/app/assets/javascripts/import_entities/import_projects/store/mutations.js b/app/assets/javascripts/import_entities/import_projects/store/mutations.js
index 3d718a6a386..1a96508bd48 100644
--- a/app/assets/javascripts/import_entities/import_projects/store/mutations.js
+++ b/app/assets/javascripts/import_entities/import_projects/store/mutations.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import * as types from './mutation_types';
 import { STATUSES } from '../../constants';
 
-const makeNewImportedProject = importedProject => ({
+const makeNewImportedProject = (importedProject) => ({
   importSource: {
     id: importedProject.id,
     fullName: importedProject.importSource,
@@ -12,15 +12,15 @@ const makeNewImportedProject = importedProject => ({
   importedProject,
 });
 
-const makeNewIncompatibleProject = project => ({
+const makeNewIncompatibleProject = (project) => ({
   importSource: { ...project, incompatible: true },
   importedProject: null,
 });
 
 const processLegacyEntries = ({ newRepositories, existingRepositories, factory }) => {
   const newEntries = [];
-  newRepositories.forEach(project => {
-    const existingProject = existingRepositories.find(p => p.importSource.id === project.id);
+  newRepositories.forEach((project) => {
+    const existingProject = existingRepositories.find((p) => p.importSource.id === project.id);
     const importedProjectShape = factory(project);
 
     if (existingProject) {
@@ -66,7 +66,7 @@ export default {
       state.repositories = [
         ...newImportedProjects,
         ...state.repositories,
-        ...repositories.providerRepos.map(project => ({
+        ...repositories.providerRepos.map((project) => ({
           importSource: project,
           importedProject: null,
         })),
@@ -91,7 +91,7 @@ export default {
   },
 
   [types.REQUEST_IMPORT](state, { repoId, importTarget }) {
-    const existingRepo = state.repositories.find(r => r.importSource.id === repoId);
+    const existingRepo = state.repositories.find((r) => r.importSource.id === repoId);
     existingRepo.importedProject = {
       importStatus: STATUSES.SCHEDULING,
       fullPath: `/${importTarget.targetNamespace}/${importTarget.newName}`,
@@ -99,18 +99,18 @@ export default {
   },
 
   [types.RECEIVE_IMPORT_SUCCESS](state, { importedProject, repoId }) {
-    const existingRepo = state.repositories.find(r => r.importSource.id === repoId);
+    const existingRepo = state.repositories.find((r) => r.importSource.id === repoId);
     existingRepo.importedProject = importedProject;
   },
 
   [types.RECEIVE_IMPORT_ERROR](state, repoId) {
-    const existingRepo = state.repositories.find(r => r.importSource.id === repoId);
+    const existingRepo = state.repositories.find((r) => r.importSource.id === repoId);
     existingRepo.importedProject = null;
   },
 
   [types.RECEIVE_JOBS_SUCCESS](state, updatedProjects) {
-    updatedProjects.forEach(updatedProject => {
-      const repo = state.repositories.find(p => p.importedProject?.id === updatedProject.id);
+    updatedProjects.forEach((updatedProject) => {
+      const repo = state.repositories.find((p) => p.importedProject?.id === updatedProject.id);
       if (repo?.importedProject) {
         repo.importedProject.importStatus = updatedProject.importStatus;
       }
@@ -131,7 +131,7 @@ export default {
   },
 
   [types.SET_IMPORT_TARGET](state, { repoId, importTarget }) {
-    const existingRepo = state.repositories.find(r => r.importSource.id === repoId);
+    const existingRepo = state.repositories.find((r) => r.importSource.id === repoId);
 
     if (
       importTarget.targetNamespace === state.defaultTargetNamespace &&
diff --git a/app/assets/javascripts/import_entities/import_projects/utils.js b/app/assets/javascripts/import_entities/import_projects/utils.js
index 0610117e09b..38bd529321a 100644
--- a/app/assets/javascripts/import_entities/import_projects/utils.js
+++ b/app/assets/javascripts/import_entities/import_projects/utils.js
@@ -11,3 +11,9 @@ export function getImportStatus(project) {
 export function isProjectImportable(project) {
   return !isIncompatible(project) && getImportStatus(project) === STATUSES.NONE;
 }
+
+export function isImporting(repo) {
+  return [STATUSES.SCHEDULING, STATUSES.SCHEDULED, STATUSES.STARTED].includes(
+    repo.importedProject?.importStatus,
+  );
+}