1 files changed, 102 insertions, 75 deletions

diff --git a/app/assets/javascripts/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_projects/components/import_projects_table.vue
index 6a467fb8c6a..72fdaca7e24 100644
--- a/app/assets/javascripts/import_projects/components/import_projects_table.vue
+++ b/app/assets/javascripts/import_projects/components/import_projects_table.vue
@@ -3,10 +3,12 @@ import { throttle } from 'lodash';
 import { mapActions, mapState, mapGetters } from 'vuex';
 import { GlButton, GlLoadingIcon } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
+import PaginationLinks from '~/vue_shared/components/pagination_links.vue';
 import ImportedProjectTableRow from './imported_project_table_row.vue';
 import ProviderRepoTableRow from './provider_repo_table_row.vue';
 import IncompatibleRepoTableRow from './incompatible_repo_table_row.vue';
-import eventHub from '../event_hub';
+import PageQueryParamSync from './page_query_param_sync.vue';
+import { isProjectImportable } from '../utils';
 
 const reposFetchThrottleDelay = 1000;
 
@@ -16,8 +18,10 @@ export default {
     ImportedProjectTableRow,
     ProviderRepoTableRow,
     IncompatibleRepoTableRow,
+    PageQueryParamSync,
     GlLoadingIcon,
     GlButton,
+    PaginationLinks,
   },
   props: {
     providerTitle: {
@@ -29,23 +33,37 @@ export default {
       required: false,
       default: true,
     },
+    paginatable: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
 
   computed: {
-    ...mapState([
-      'importedProjects',
-      'providerRepos',
-      'incompatibleRepos',
-      'isLoadingRepos',
-      'filter',
-    ]),
+    ...mapState(['filter', 'repositories', 'namespaces', 'defaultTargetNamespace', 'pageInfo']),
     ...mapGetters([
+      'isLoading',
       'isImportingAnyRepo',
-      'hasProviderRepos',
-      'hasImportedProjects',
+      'hasImportableRepos',
       'hasIncompatibleRepos',
     ]),
 
+    availableNamespaces() {
+      const serializedNamespaces = this.namespaces.map(({ fullPath }) => ({
+        id: fullPath,
+        text: fullPath,
+      }));
+
+      return [
+        { text: __('Groups'), children: serializedNamespaces },
+        {
+          text: __('Users'),
+          children: [{ id: this.defaultTargetNamespace, text: this.defaultTargetNamespace }],
+        },
+      ];
+    },
+
     importAllButtonText() {
       return this.hasIncompatibleRepos
         ? __('Import all compatible repositories')
@@ -64,7 +82,8 @@ export default {
   },
 
   mounted() {
-    return this.fetchRepos();
+    this.fetchNamespaces();
+    this.fetchRepos();
   },
 
   beforeDestroy() {
@@ -75,17 +94,14 @@ export default {
   methods: {
     ...mapActions([
       'fetchRepos',
-      'fetchReposFiltered',
-      'fetchJobs',
+      'fetchNamespaces',
       'stopJobsPolling',
       'clearJobsEtagPoll',
       'setFilter',
+      'importAll',
+      'setPage',
     ]),
 
-    importAll() {
-      eventHub.$emit('importAll');
-    },
-
     handleFilterInput({ target }) {
       this.setFilter(target.value);
     },
@@ -93,79 +109,90 @@ export default {
     throttledFetchRepos: throttle(function fetch() {
       this.fetchRepos();
     }, reposFetchThrottleDelay),
+
+    isProjectImportable,
   },
 };
 </script>
 
 <template>
   <div>
+    <page-query-param-sync :page="pageInfo.page" @popstate="setPage" />
+
     <p class="light text-nowrap mt-2">
       {{ s__('ImportProjects|Select the projects you want to import') }}
     </p>
     <template v-if="hasIncompatibleRepos">
-      <slot name="incompatible-repos-warning"> </slot>
+      <slot name="incompatible-repos-warning"></slot>
     </template>
-    <div
-      v-if="!isLoadingRepos"
-      class="d-flex justify-content-between align-items-end flex-wrap mb-3"
-    >
-      <gl-button
-        variant="success"
-        :loading="isImportingAnyRepo"
-        :disabled="!hasProviderRepos"
-        type="button"
-        @click="importAll"
-      >
-        {{ importAllButtonText }}
-      </gl-button>
-      <slot name="actions"></slot>
-      <form v-if="filterable" class="gl-ml-auto" novalidate @submit.prevent>
-        <input
-          :value="filter"
-          data-qa-selector="githubish_import_filter_field"
-          class="form-control"
-          name="filter"
-          :placeholder="__('Filter your projects by name')"
-          autofocus
-          size="40"
-          @input="handleFilterInput($event)"
-          @keyup.enter="throttledFetchRepos"
-        />
-      </form>
-    </div>
     <gl-loading-icon
-      v-if="isLoadingRepos"
+      v-if="isLoading"
       class="js-loading-button-icon import-projects-loading-icon"
       size="md"
     />
-    <div
-      v-else-if="hasProviderRepos || hasImportedProjects || hasIncompatibleRepos"
-      class="table-responsive"
-    >
-      <table class="table import-table">
-        <thead>
-          <th class="import-jobs-from-col">{{ fromHeaderText }}</th>
-          <th class="import-jobs-to-col">{{ __('To GitLab') }}</th>
-          <th class="import-jobs-status-col">{{ __('Status') }}</th>
-          <th class="import-jobs-cta-col"></th>
-        </thead>
-        <tbody>
-          <imported-project-table-row
-            v-for="project in importedProjects"
-            :key="project.id"
-            :project="project"
-          />
-          <provider-repo-table-row v-for="repo in providerRepos" :key="repo.id" :repo="repo" />
-          <incompatible-repo-table-row
-            v-for="repo in incompatibleRepos"
-            :key="repo.id"
-            :repo="repo"
+    <template v-if="!isLoading">
+      <div class="d-flex justify-content-between align-items-end flex-wrap mb-3">
+        <gl-button
+          variant="success"
+          :loading="isImportingAnyRepo"
+          :disabled="!hasImportableRepos"
+          type="button"
+          @click="importAll"
+          >{{ importAllButtonText }}</gl-button
+        >
+        <slot name="actions"></slot>
+        <form v-if="filterable" class="gl-ml-auto" novalidate @submit.prevent>
+          <input
+            :value="filter"
+            data-qa-selector="githubish_import_filter_field"
+            class="form-control"
+            name="filter"
+            :placeholder="__('Filter your projects by name')"
+            autofocus
+            size="40"
+            @input="handleFilterInput($event)"
+            @keyup.enter="throttledFetchRepos"
           />
-        </tbody>
-      </table>
-    </div>
-    <div v-else class="text-center">
-      <strong>{{ emptyStateText }}</strong>
-    </div>
+        </form>
+      </div>
+      <div v-if="repositories.length" class="table-responsive">
+        <table class="table import-table">
+          <thead>
+            <th class="import-jobs-from-col">{{ fromHeaderText }}</th>
+            <th class="import-jobs-to-col">{{ __('To GitLab') }}</th>
+            <th class="import-jobs-status-col">{{ __('Status') }}</th>
+            <th class="import-jobs-cta-col"></th>
+          </thead>
+          <tbody>
+            <template v-for="repo in repositories">
+              <incompatible-repo-table-row
+                v-if="repo.importSource.incompatible"
+                :key="repo.importSource.id"
+                :repo="repo"
+              />
+              <provider-repo-table-row
+                v-else-if="isProjectImportable(repo)"
+                :key="repo.importSource.id"
+                :repo="repo"
+                :available-namespaces="availableNamespaces"
+              />
+              <imported-project-table-row v-else :key="repo.importSource.id" :project="repo" />
+            </template>
+          </tbody>
+        </table>
+      </div>
+      <div v-else class="text-center">
+        <strong>{{ emptyStateText }}</strong>
+      </div>
+      <pagination-links
+        v-if="paginatable"
+        align="center"
+        class="gl-mt-3"
+        :page-info="pageInfo"
+        :prev-page="pageInfo.page - 1"
+        :next-page="repositories.length && pageInfo.page + 1"
+        :change="setPage"
+      />
+    </template>
   </div>
 </template>